Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pomegranates and aphrodisiacs #22

Closed
wants to merge 87 commits into from

Conversation

SleepyScarecrow
Copy link
Contributor

Description

Added in The Fruit Pomegranates and 3 aphrodisiac drugs.


TODO

  • Task
  • Completed Task

Media

Example Media Embed


Changelog

🆑 SleepyScarecrow

  • add: Added pomegranates & aphrodisiacs

Mnemotechnician and others added 30 commits June 14, 2024 02:59
- Made it so that LanguageSpeakerComponent stores the actual data about entities' languages, while LanguageKnowledgeComponent stores intrinsic knowledge
- Rewrote a lot of shitcode
…fuscationMethod's dependency on LanguagePrototype
# Description
Makes it so that the station and the ATS get a very tiny bit of friction
to prevent cargo tech pros from sending either of those out of this
galaxy cluster (which has actually happened multiple times on two
servers and required either admin intervention or early round ending).

# Technical details
Added a PassiveDampeningComponent which defines how much friction an
entity receives while in 0g. FrictionRemoverSystem was updated to try to
fetch this component from an entity before updating its dampening. A new
system was added to automatically add this component (if it's not
already defined) to all station grids.

# Media
See the #when-you-code-it channel for a preview. It's kinda hard to
demonstrate, but after a few minutes, stations and the ATS come to an
almost complete stop.

# Changelog
:cl:
- tweak: Space stations now have a tiny bit of velocity dampening to
prevent them from being flunged into the void.
# Description
This cherry-picks the following two PRs of mine from delta-v:
- DeltaV-Station/Delta-v#1118 (this one is a
port of two other frontier PRs, see the original description for
details)
- DeltaV-Station/Delta-v#1232

Encompassing a total of 8 distinct changes:
1. Fixes dropping the carried person when walking to a different grid
(from station to shuttle or vice versa. Walking into space however will
still make you drop them) and also makes sure that pressing shift while
being carried does not make you escape.
2. Ensures that the carried person is always centered relative to the
parent (under certain conditions, such as walking near a gravitational
anomaly, their position can change, and that leads to really weird
effects)
3. Fixes the mass contest in CarryingSystem that caused stronger
entities to take longer to escape than weaker ones.
4. Adds popups for when you're getting picked up or being stuffed into a
bag as a pseudo-item (e.g. a felinid)
5. Adds an action to stop escaping an inventory. This action gets added
to your action bar when you attempt escaping and gets removed when you
stop or escape. It applies both to carrying and items (hampsters,
felinids, whatever else).
6. Adds a sleep action for pseudo-items stuffed inside a suitable bag.
The bag must have a special component, which is added to the base
backpack item and thus inherited by all soft bags (duffels, satchels,
etc). Contrary to a popular belief, sleeping IS PURELY COSMETICAL and
does not provide healing. (Beds provide healing when you buckle into
them and that healing does not depend on whether or not you're sleeping)
7. Makes it so that when you try to take a pseudo-item out of the bag
(e.g. a felinid), you automatically try to carry them (if you don't have
enough free hands, they will be dropped on the floor like usually), and
enables you to insert the carried person into a bag, but only if they're
a pseudo-item (e.g. felinid).
8. Allows pseudoitems to be inserted into bags even when there are other
items (as long as there's enough space)

---

## For technical details and video showcases, see the original PRs

This PR is split into separate commits so different parts can be
reverted if deemed unneccessary.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it

<details><summary><h1>Media</h1></summary>
<p>

![Example Media Embed](https://example.com/thisimageisntreal.png)

</p>
</details>

---
-->

# Changelog
:cl:
- fix: Carrying is less likely to behave erratically or suddenly
interrupt now.
- add: You can now see when someone is trying to pick you up, and also
you can interrupt your attempt at escaping from their hands or
inventory.
- add: You can now properly take Felinids out of bags and place them
inside.
- add: Scientists have discovered that Felinids can sleep in bags.
# Description
Ports delta-v paper signatures implemented by me in
DeltaV-Station/Delta-v#1172, including the
changes later introduced by deltanedas in
DeltaV-Station/Delta-v#1345.

Everything should be pretty self-explanatory, see the original PR for
details.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/69920617/50737402-a60d-425a-8938-f6e47427b22b)

(see the original PR for a video demonstation)

</p>
</details>

---

# Changelog

:cl:
- add: You can now sign paper by alt-clicking it while holding a pen.

---------

Signed-off-by: Mnemotechnican <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Copy link
Contributor

Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation.

You can move your current work from the master branch to another branch by branching from and resetting the master branch.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files labels Jul 13, 2024
@github-actions github-actions bot closed this Jul 13, 2024
Copy link
Contributor

RSI Diff Bot; head commit 8b3121c merging into cc36187
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Actions/escapeinventory.rsi

State Old New Status
cancel-escape Added

Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi

State Old New Status
icon Added

Resources/Textures/Interface/Alerts/offer_item.rsi

State Old New Status
offer_item Added

Resources/Textures/Interface/Misc/give_item.rsi

State Old New Status
give_item Added

Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi

State Old New Status
icon Added
icon_open Added
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_stamp-signature Added

Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi

State Old New Status
dead Added
harvest Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added
stage-4 Added
stage-5 Added
stage-6 Added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants